From: Paul Eggert <eggert@cs.ucla.edu>
Date: Fri, 14 Jan 2011 00:33:24 +0000 (-0800)
Subject: Merge from mainline.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~5157^2~13
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=9b68a0707e3f965d2bc9ec2c4cf43c422dfdbd1a;p=emacs.git

Merge from mainline.
---

9b68a0707e3f965d2bc9ec2c4cf43c422dfdbd1a